merge emacs-23
authorKenichi Handa <handa@m17n.org>
Tue, 12 Oct 2010 12:41:18 +0000 (21:41 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 12 Oct 2010 12:41:18 +0000 (21:41 +0900)

Trivial merge